ci: Use Fedora 29 artifacts

Use Fedora 29 artifacts instead of Fedora 28, since 28 is now
end-of-life.

Also rename `ci/fah28-insttests.sh` -> `ci/fah29-insttests.sh`
and use the https://getfedora.org/atomic_qcow2_latest redirect
URL for the latest Fedora Atomic Host 29 image.

Closes: #1871
Approved by: jlebon

diff --git a/.papr-ex.yaml b/.papr-ex.yaml
index 8cba2ca39e7135263497a68d25ce0bd8b93daaf6..fbbd19dda5783c2c7d9064a2fedef159a9dd2972 100644 (file)
--- a/.papr-ex.yaml
+++ b/.papr-ex.yaml
@@ -4,15 +4,15 @@ branches:
     - auto
     - try
 
-context: FAH28-insttests
+context: FAH29-insttests
 required: false
 
 container:
-  image: registry.fedoraproject.org/fedora:28
+  image: registry.fedoraproject.org/fedora:29
   kvm: true
 
 tests:
-  - ci/fah28-insttests.sh
+  - ci/fah29-insttests.sh
 
 artifacts:
   - tests/installed/artifacts/
@@ -27,8 +27,8 @@ branches:
     - try
 required: true
 container:
-  image: registry.fedoraproject.org/fedora:28
-context: f28-primary
+  image: registry.fedoraproject.org/fedora:29
+context: f29-primary
 env:
   # We only use -Werror=maybe-uninitialized here with a "fixed" toolchain
   CFLAGS: '-fsanitize=undefined -fsanitize-undefined-trap-on-error -fsanitize=address -O2 -Wp,-D_FORTIFY_SOURCE=2'
@@ -51,10 +51,10 @@ artifacts:
 ---
 # And now the contexts below here are variant container builds
 
-context: f28-rust
+context: f29-rust
 inherit: true
 container:
-    image: registry.fedoraproject.org/fedora:28
+    image: registry.fedoraproject.org/fedora:29
 env:
   CONFIGOPTS: '--enable-rust'
   CI_PKGS: cargo
@@ -65,10 +65,10 @@ tests:
 
 ---
 
-context: f28-gnutls
+context: f29-gnutls
 inherit: true
 container:
-    image: registry.fedoraproject.org/fedora:28
+    image: registry.fedoraproject.org/fedora:29
 env:
   CONFIGOPTS: '--with-crypto=gnutls'
   CI_PKGS: pkgconfig(gnutls)
@@ -81,7 +81,7 @@ tests:
 
 inherit: true
 
-context: f28-minimal
+context: f29-minimal
 env:
   CONFIGOPTS: '--without-curl --without-soup --disable-gtk-doc --disable-man
    --disable-rust --without-libarchive --without-selinux --without-smack
@@ -96,7 +96,7 @@ tests:
 inherit: true
 required: true
 
-context: f28-libsoup
+context: f29-libsoup
 
 env:
   CONFIGOPTS: "--without-curl --without-openssl --with-soup"
@@ -109,7 +109,7 @@ tests:
 inherit: true
 required: true
 
-context: f28-introspection-tests
+context: f29-introspection-tests
 
 env:
     # ASAN conflicts with introspection testing;

diff --git a/.papr.yml b/.papr.yml
index 7b3ca018083e2015ba1d725c9810948d9438b50d..22d84da58ff549ffb1b03858e957b831bc359327 100644 (file)
--- a/.papr.yml
+++ b/.papr.yml
@@ -6,8 +6,8 @@ branches:
     - try
 required: true
 container:
-  image: registry.fedoraproject.org/fedora:28
-context: f28-primary
+  image: registry.fedoraproject.org/fedora:29
+context: f29-primary
 env:
   # We only use -Werror=maybe-uninitialized here with a "fixed" toolchain
   CFLAGS: '-fsanitize=undefined -fsanitize-undefined-trap-on-error -fsanitize=address -O2 -Wp,-D_FORTIFY_SOURCE=2'
@@ -31,10 +31,10 @@ artifacts:
 ---
 # And now the contexts below here are variant container builds
 
-context: f28-rust
+context: f29-rust
 inherit: true
 container:
-    image: registry.fedoraproject.org/fedora:28
+    image: registry.fedoraproject.org/fedora:29
 env:
   CONFIGOPTS: '--enable-rust'
   CI_PKGS: cargo
@@ -45,10 +45,10 @@ tests:
 
 ---
 
-context: f28-gnutls
+context: f29-gnutls
 inherit: true
 container:
-    image: registry.fedoraproject.org/fedora:28
+    image: registry.fedoraproject.org/fedora:29
 env:
   CONFIGOPTS: '--with-crypto=gnutls'
   CI_PKGS: pkgconfig(gnutls)
@@ -61,7 +61,7 @@ tests:
 
 inherit: true
 
-context: f28-minimal
+context: f29-minimal
 env:
   CONFIGOPTS: '--without-curl --without-soup --disable-gtk-doc --disable-man
    --disable-rust --without-libarchive --without-selinux --without-smack
@@ -76,7 +76,7 @@ tests:
 inherit: true
 required: true
 
-context: f28-libsoup
+context: f29-libsoup
 
 env:
   CONFIGOPTS: "--without-curl --without-openssl --with-soup"
@@ -89,7 +89,7 @@ tests:
 inherit: true
 required: true
 
-context: f28-introspection-tests
+context: f29-introspection-tests
 
 env:
     # ASAN conflicts with introspection testing;
@@ -108,19 +108,19 @@ branches:
     - auto
     - try
 
-context: f28-flatpak
+context: f29-flatpak
 required: true
 
 # This test case wants an "unprivileged container with bubblewrap",
 # which we don't have right now; so just provision a VM and do a
 # docker --privileged run.
 host:
-  distro: fedora/28/atomic
+  distro: fedora/29/atomic
   specs:
     ram: 4096  # build-bundle is a static delta, which needs RAM right now
 
 tests:
-  - docker run --rm --privileged -v $(pwd):/srv/code registry.fedoraproject.org/fedora:28 /bin/sh -c "cd /srv/code && ./ci/flatpak.sh"
+  - docker run --rm --privileged -v $(pwd):/srv/code registry.fedoraproject.org/fedora:29 /bin/sh -c "cd /srv/code && ./ci/flatpak.sh"
 
 artifacts:
   - test-suite.log
@@ -136,16 +136,16 @@ branches:
     - auto
     - try
 
-context: f28-rpmostree
+context: f29-rpmostree
 # XXX: some issues currently failing that need investigating.
 required: false
 
 cluster:
   hosts:
     - name: vmcheck
-      distro: fedora/28/atomic
+      distro: fedora/29/atomic
   container:
-    image: registry.fedoraproject.org/fedora:28
+    image: registry.fedoraproject.org/fedora:29
 
 env:
   HOSTS: vmcheck

diff --git a/ci/fah28-insttests.sh b/ci/fah28-insttests.sh
deleted file mode 100755 (executable)
index 22560be..0000000
--- a/ci/fah28-insttests.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/bash
-set -xeuo pipefail
-
-./tests/installed/provision.sh
-# TODO: enhance papr to have caching, a bit like https://docs.travis-ci.com/user/caching/
-cd tests/installed
-# This should be https://getfedora.org/atomic_qcow2_latest but that's broken
-curl -Lo fedora-atomic-host.qcow2 https://kojipkgs.fedoraproject.org/compose/twoweek/Fedora-Atomic-28-20180626.0/compose/AtomicHost/x86_64/images/Fedora-AtomicHost-28-20180626.0.x86_64.qcow2
-exec env "TEST_SUBJECTS=$(pwd)/fedora-atomic-host.qcow2" ./run.sh

diff --git a/ci/fah29-insttests.sh b/ci/fah29-insttests.sh
new file mode 100755 (executable)
index 0000000..a045cf5
--- /dev/null
+++ b/ci/fah29-insttests.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/bash
+set -xeuo pipefail
+
+./tests/installed/provision.sh
+# TODO: enhance papr to have caching, a bit like https://docs.travis-ci.com/user/caching/
+cd tests/installed
+curl -Lo fedora-atomic-host.qcow2 https://getfedora.org/atomic_qcow2_latest
+exec env "TEST_SUBJECTS=$(pwd)/fedora-atomic-host.qcow2" ./run.sh